From b264d27c4fb5f4937ea070ba122a344acc605b14 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 28 Aug 2013 14:27:02 +0800 Subject: [PATCH] MSVC Builds: Fix Build of Introspection Files We need to copy the GDK .lib/.dll from Release_Broadway\\bin or Debug_Broadway\\bin to Release\\bin or Debug\\bin respectively during the build of Broadway flavors of GDK, as the MSVC introspection builds expects the GDK .lib/.dll to be in Release\\bin or Debug\\bin. Use a new property sheet to do so for Broadway builds of GDK-during the builds of Win32-only GDK, the broadway builds of the GDK .lib/.dll would be cleared out prior to the build of the Win32-only GDK. --- build/win32/vs10/Makefile.am | 3 +- build/win32/vs10/gdk.vcxprojin | 4 ++ build/win32/vs10/gtk-copy-gdk-broadway.props | 44 +++++++++++++++++++ build/win32/vs9/Makefile.am | 3 +- build/win32/vs9/gdk.vcprojin | 6 +-- build/win32/vs9/gtk-copy-gdk-broadway.vsprops | 30 +++++++++++++ 6 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 build/win32/vs10/gtk-copy-gdk-broadway.props create mode 100644 build/win32/vs9/gtk-copy-gdk-broadway.vsprops diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 4743b8ecbf..44b2883d1b 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -36,6 +36,7 @@ EXTRA_DIST += \ gtk-install-headers-data.props \ gtk-version-paths.props \ gtkprebuild-broadway.props \ - gtkprebuild.props + gtkprebuild.props \ + gtk-copy-gdk-broadway.props -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin index 62f48c3260..d8d07278bf 100644 --- a/build/win32/vs10/gdk.vcxprojin +++ b/build/win32/vs10/gdk.vcxprojin @@ -110,18 +110,22 @@ + + + + diff --git a/build/win32/vs10/gtk-copy-gdk-broadway.props b/build/win32/vs10/gtk-copy-gdk-broadway.props new file mode 100644 index 0000000000..76fc97da80 --- /dev/null +++ b/build/win32/vs10/gtk-copy-gdk-broadway.props @@ -0,0 +1,44 @@ + + + + <_PropertySheetDisplayName>gtkcopygdkbroadwayprops + + + + +if "$(Configuration)" == "Release" goto END + +if "$(Configuration)" == "Debug" goto END + +if "$(Configuration)" == "Release_Broadway" goto DoRelease + +if "$(Configuration)" == "Debug_Broadway" goto DoDebug + + +:DoRelease + +mkdir .\Release\$(Platform)\bin + +copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\ + +copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\ + +goto END + + +:DoDebug + +mkdir .\Debug\$(Platform)\bin + +copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\ + +copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Debug\$(Platform)\bin\ + +goto END + + +:END + + + + \ No newline at end of file diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 71bf0e5483..f56ec64236 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -24,6 +24,7 @@ EXTRA_DIST += \ gtk-install-headers-data.vsprops \ gtk-version-paths.vsprops \ gtkprebuild.vsprops \ - gtkprebuild-broadway.vsprops + gtkprebuild-broadway.vsprops \ + gtk-copy-gdk-broadway.vsprops -include $(top_srcdir)/git.mk diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin index 26c675f687..aafa97a331 100644 --- a/build/win32/vs9/gdk.vcprojin +++ b/build/win32/vs9/gdk.vcprojin @@ -53,7 +53,7 @@ @@ -117,7 +117,7 @@ diff --git a/build/win32/vs9/gtk-copy-gdk-broadway.vsprops b/build/win32/vs9/gtk-copy-gdk-broadway.vsprops new file mode 100644 index 0000000000..d0dab58ddf --- /dev/null +++ b/build/win32/vs9/gtk-copy-gdk-broadway.vsprops @@ -0,0 +1,30 @@ + + + + \ No newline at end of file -- 2.30.2